From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 19 Aug 2013 21:30:06 +0000 (+0200)
Subject: network: use the VPN state to compute the icon for VPN items
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3568
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fc5aadd6dd8d217550f4858568cb0d5556c9a56e;p=gnome-shell.git

network: use the VPN state to compute the icon for VPN items

We watch changes in the VPN state, not the active connection state,
so if we use the active connection state, we might miss an update
(because the VPN property is notified before the other one)

https://bugzilla.gnome.org/show_bug.cgi?id=706262
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 20157f4fa..f08f57d76 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1137,7 +1137,7 @@ const NMVPNConnectionItem = new Lang.Class({
 
     getIndicatorIcon: function() {
         if (this._activeConnection) {
-            if (this._activeConnection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
+            if (this._activeConnection.vpn_state < NetworkManager.VPNConnectionState.ACTIVATED)
                 return 'network-vpn-acquiring-symbolic';
             else
                 return 'network-vpn-symbolic';